From e705309f8616910dd359d55e789e8fc2fb9664d3 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Tue, 24 Apr 2018 10:46:54 +0100 Subject: [PATCH] debian-hardened-buildflags-no-LO-fstack-protector-strong don't hardcode -fstack-protector-strong in configure.ac/gbuild. We get the hardening flags from dpkg-buildflags anyway. Gbp-Pq: Name debian-hardened-buildflags-no-LO-fstack-protector-strong.diff --- config_host.mk.in | 1 - configure.ac | Bin 451169 -> 450757 bytes solenv/gbuild/platform/com_GCC_defs.mk | 6 ------ 3 files changed, 7 deletions(-) diff --git a/config_host.mk.in b/config_host.mk.in index 61ae5a70427..eb3a70566b4 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -234,7 +234,6 @@ export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@ export USING_X11=@USING_X11@ export HAMCREST_JAR=@HAMCREST_JAR@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ -export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@ export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@ export HAVE_GCC_BUILTIN_FFS=@HAVE_GCC_BUILTIN_FFS@ export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@ diff --git a/configure.ac b/configure.ac index 9a589ff074133a7188f9b054bf49ac546de2913f..019cd442c85997520d2cc2c1285e48816581cd4d 100644 GIT binary patch delta 33 mcmaEOMEdAK>4p}@7N#xCAw2CLc$tBi1&CR+yaE94gbkYj delta 108 zcmX?lQ2OB!>4p}@7N#xCAw1I!5?LgsJN{)fm|nk|k&RISEWo71HT^?4v-@-oWoEJI z6S|oXx`4z!Q&y4b7iKW(Ojmf##4&vW3ln#H2oEz5vj8#c_7EPn!Ycq^ CKOqnR diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 1a6eebe7f45..c0575d512ab 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -113,12 +113,6 @@ endif gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX) -ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE) -gb_CFLAGS_COMMON += -fstack-protector-strong -gb_CXXFLAGS_COMMON += -fstack-protector-strong -gb_LinkTarget_LDFLAGS += -fstack-protector-strong -endif - ifeq ($(ENABLE_PCH),TRUE) ifneq ($(COM_IS_CLANG),TRUE) gb_CFLAGS_COMMON += -fpch-preprocess -Winvalid-pch -- 2.30.2